[PATCH] <short summary of the patch>

TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.

Gbp-Pq: Name Version_2_7_2pre14

diff --git a/cmpnew/gcl_cmpcall.lsp b/cmpnew/gcl_cmpcall.lsp
index 9368c3599ddcab0d485808452bc9d380b7cfc42b..6ff2fd1efd4c81c0ce7ebbdf97b51ebcfa681082 100644 (file)
--- a/cmpnew/gcl_cmpcall.lsp
+++ b/cmpnew/gcl_cmpcall.lsp
@@ -276,12 +276,18 @@
 (defun commasep (x)
   (mapcon (lambda (x) (if (cdr x) (list (car x) ",") (list (car x)))) x))
 
-(defun ms (&rest r) 
-  (apply 'concatenate 'string 
-        (mapcar (lambda (x) 
-                  (cond ((listp x) (apply 'ms x))
-                        ((stringp x) x)
-                        ((write-to-string x)))) r)))
+(defun ms (&rest r)
+  (labels ((msh (x)
+            (cond ((< (length x) (1- call-arguments-limit))
+                   (apply 'concatenate 'string
+                          (mapcar (lambda (x)
+                                    (cond ((listp x) (msh x))
+                                          ((stringp x) x)
+                                          ((write-to-string x))))
+                                  x)))
+                  ((let ((y (nthcdr (- call-arguments-limit 2) x)))
+                     (concatenate 'string (msh (ldiff x y)) (msh y)))))))
+    (msh r)))
 
 (defun nords (n &aux (i -1))
   (mapl (lambda (x) (setf (car x) (incf i))) (make-list n)))

diff --git a/git.tag b/git.tag
index d415ef43901390363b0cd46b731d20e592580a5e..b8af7a535004a4f74288f92074e578c329e52dbc 100644 (file)
--- a/git.tag
+++ b/git.tag
@@ -1 +1 @@
-"Version_2_7_2pre13"
+"Version_2_7_2pre14"

diff --git a/mod/gcl_defpackage.lsp b/mod/gcl_defpackage.lsp
index e3fdbf47e3193d0c4ba05dd508b96880d930ee9a..b1b59d79d4007e8a128591393b64e1fb9ddd85de 100644 (file)
--- a/mod/gcl_defpackage.lsp
+++ b/mod/gcl_defpackage.lsp
@@ -67,13 +67,11 @@
 ;;; -----------------------------------------------------------------
 
 (unless (find-package :defpackage)
-  (make-package :defpackage :use '(:cl)))
+  (make-package :defpackage :use '(:cl :sloop)))
 (in-package :defpackage)
 
 (export '(defpackage))
 
-(use-package :SLOOP)
-
 (defmacro DEFPACKAGE (name &rest options)
   (declare (optimize (safety 1)))
   "DEFPACKAGE - DEFINED-PACKAGE-NAME {OPTION}*                 [Macro]

diff --git a/unixport/init_raw.lsp.in b/unixport/init_raw.lsp.in
index 1b5f38c1f25885276fe7cce3de22608dc6232421..4763afdc6be0d9cd1b4341cdb9a4eb0a2a1c4e58 100644 (file)
--- a/unixport/init_raw.lsp.in
+++ b/unixport/init_raw.lsp.in
@@ -6,7 +6,7 @@
 (make-package :compiler :use '(:cl :si :cstruct))
 (make-package :sloop :use '(:cl))
 (make-package :ansi-loop :use'(:cl))
-(make-package :defpackage :use '(:cl))
+(make-package :defpackage :use '(:cl :sloop))
 (make-package :tk :use '(:cl :sloop))
 (make-package :fpe :use '(:cl))
 (make-package :cltl1-compat)